Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 26 Feb 2010 14:26:02 +0000 (14:26 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 26 Feb 2010 14:26:02 +0000 (14:26 +0000)
commit65b4a453d712ddabb4f0ff15a212946c87fdf433
treeba1e5e140121eb235e5c034e7c46c07ad3050bca
parentc6d53cde686c7ce5664b4f890d9d84646064b3ba
parentea5eff4c56a3cf8a7dba3a1607f0d5d8ed68596e
Merge from mainline.